fix conflicts

diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index 8de2db4dca59411b95fdfcd740d3787c7689378c..1e57eeb57c4dbd399ec7620dce027cb9568b2e80 100644 (file)
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -23,12 +23,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "lisp.h"
 #include "frame.h"
 #include "xterm.h"
-<<<<<<< HEAD
 #ifdef HAVE_XWIDGETS
 #include "xwidget.h"
 #endif
-=======
->>>>>>> trunk
 #include "emacsgtkfixed.h"
 
 /* Silence a bogus diagnostic; see GNOME bug 683906.  */

diff --git a/src/window.c b/src/window.c
index 5c4527f46714c22106dd10afbfe74b83993e9b64..410015e472e54fed5e5a3a0129c508782966901f 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -45,15 +45,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef MSDOS
 #include "msdos.h"
 #endif
-<<<<<<< HEAD
 #ifdef HAVE_NS
 #include "nsterm.h"
 #endif
 #ifdef HAVE_XWIDGETS
 #include "xwidget.h"
 #endif
-=======
->>>>>>> trunk
 
 Lisp_Object Qwindowp, Qwindow_live_p;
 static Lisp_Object Qwindow_valid_p;